merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 28 Aug 2006 22:26:37 +0000 (16:26 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 28 Aug 2006 22:26:37 +0000 (16:26 -0600)

Trivial merge